Custom getCallerClass in entitlement bridge #125139
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prdoyle
added
auto-backport
|
For me it fixes the debugger connection problem. Don't understand it enough to approve but at least it seems to works in my case. |
mark-vieira
reviewed
Mar 19, 2025
libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/Util.java
Show resolved
Hide resolved
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
ldematte
reviewed
Mar 20, 2025
|
Sorry @ldematte! Forgot to update the description when I moved this out of Draft. |
smalyshev
approved these changes
Apr 1, 2025
rjernst
approved these changes
Apr 1, 2025
This was referenced Apr 1, 2025
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Apr 1, 2025
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Apr 1, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 1, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 1, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See ES-11273
Problem
StackWalker.getCallerClassis specified to throwIllegalCallerExceptionwhen it is "called from a method which is the last frame on the stack". It turns out this includes situations where a method is called via JNI from a native method. @smalyshev observed that, when attaching a debugger usingserver=y, a native method callsThread.isDaemon, and our instrumentation inside the latter callsgetCallerClasswhich throws.Rejected solutions
The most obvious remedy would be to write a wrapper method that calls
getCallerClassand catches the exception; however, this would add an extra stack frame that would causegetCallerClassto return the wrong frame.Inserting a catch into the instrumentation bytecode is a possibility, but it would dramatically increase the complexity of the instrumentation, which is currently quite straightforward.
Selected solution
I've opted to implement our own
getCallerClasswith the behviour we want, as a drop-in replacement for the one fromStackWalker. Instead of throwing when there's no caller frame, it returns a marker classNO_CLASSto indicate that condition.